<!DOCTYPE html>
<html>
  <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width,initial-scale=1.0">
    <title>ele-demo</title>
		<link rel="stylesheet" href="static/css/reset.css">
  </head>
  <body>
    更改1
    <div id="app">right提交</div>冲突下了看下
  </body>
  更改2
</html>我是test----继续test======
我是更改4
master test--改的
=======
